From: Timo Tijhof <ttijhof@wikimedia.org>
Date: Wed, 6 Jun 2012 20:07:12 +0000 (+0200)
Subject: ResourceLoaderLanguageDataModule: clean up
X-Git-Tag: 1.31.0-rc.0~23366^2
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=59a390c8b1b0530c63f73f5e442fb077113a7a21;p=lhc%2Fweb%2Fwiklou.git

ResourceLoaderLanguageDataModule: clean up

Change-Id: Id64e7ec8f22cc74926ff374ca207bf19552398aa
---

diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index aeeb29189d..49047353dd 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -39,7 +39,7 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 
 	/**
 	 * @param $context ResourceLoaderContext
-	 * @return string Javascript code
+	 * @return string: Javascript code
 	 */
 	public function getScript( ResourceLoaderContext $context ) {
 		global $wgContLang;
@@ -62,13 +62,14 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 		$hash = md5( serialize( $forms ) );
 
 		$result = $cache->get( $key );
-		if ( is_array( $result ) ) {
-			if ( $result['hash'] === $hash ) {
-				return $result['timestamp'];
-			}
+		if ( is_array( $result ) && $result['hash'] === $hash ) {
+			return $result['timestamp'];
 		}
 		$timestamp = wfTimestamp();
-		$cache->set( $key, array( 'hash' => $hash, 'timestamp' => $timestamp ) );
+		$cache->set( $key, array(
+			'hash' => $hash,
+			'timestamp' => $timestamp,
+		) );
 		return $timestamp;
 	}